Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Wed, 5 May 2010 10:17:53 +0000 (10:17 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Wed, 5 May 2010 10:17:53 +0000 (10:17 +0000)
commita2498742541b6c9f5e08147b0adc5a99eb3bf7a7
treeb967b12c5827096c7fe198283835feb2a4b94170
parent9ebbf1fbac129d1088fd14906d02f08fcf5aa17b
parenta13a0caa10edebe4d6126fdcb2a325ddc9a1e53e
Merge from mainline.